Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

While updating NodeStatus, only first get served from cache #37788

Merged
merged 1 commit into from
Dec 1, 2016
Merged

While updating NodeStatus, only first get served from cache #37788

merged 1 commit into from
Dec 1, 2016

Conversation

wojtek-t
Copy link
Member

@wojtek-t wojtek-t commented Dec 1, 2016

Fix #37725

@wojtek-t wojtek-t added cherrypick-candidate priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-blocker release-note-none Denotes a PR that doesn't merit a release note. labels Dec 1, 2016
@wojtek-t wojtek-t added this to the v1.5 milestone Dec 1, 2016
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 1, 2016
@k8s-oncall
Copy link

This change is Reviewable

@wojtek-t wojtek-t mentioned this pull request Dec 1, 2016
Closed
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 1, 2016
@gmarek
Copy link
Contributor

gmarek commented Dec 1, 2016

lgtm

@k8s-ci-robot
Copy link
Contributor

Jenkins verification failed for commit d1ddb1fcb881c9f0145a67d0321dfb522824df47. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 1, 2016
@dchen1107
Copy link
Member

LGTM, but I will leave this to @lavalamp to make the final call. Thanks!

@lavalamp
Copy link
Member

lavalamp commented Dec 1, 2016

/lgtm

thanks for quick fix!!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 1, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE etcd3 e2e failed for commit 54d49cb. Full PR test history.

The magic incantation to run this job again is @k8s-bot gce etcd3 e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit d3a14c0 into kubernetes:master Dec 1, 2016
@saad-ali
Copy link
Member

saad-ali commented Dec 2, 2016

This PR has merge conflicts, I will not pick it up in my batch cherry pick to 1.5 branch. Please prepare a separate cherry pick. See "About Cherrypicks" section in https://groups.google.com/forum/#!topic/kubernetes-dev/mvIXrgEyHPY for help.

@wojtek-t
Copy link
Member Author

wojtek-t commented Dec 2, 2016

@saad-ali - sure. On it.

@wojtek-t wojtek-t mentioned this pull request Dec 2, 2016
Closed
@wojtek-t
Copy link
Member Author

wojtek-t commented Dec 2, 2016

@saad-ali - opened #37927

@wojtek-t wojtek-t mentioned this pull request Dec 2, 2016
Merged
@saad-ali saad-ali added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 2, 2016
@saad-ali
Copy link
Member

saad-ali commented Dec 2, 2016

Ack

k8s-github-robot pushed a commit that referenced this pull request Dec 2, 2016
Merge pull request #37929 from wojtek-t/automated-cherry-pick-of-#377…
116e7fb 
…88-upstream-release-1.5

Automatic merge from submit-queue

While updating NodeStatus, only first get served from cache

Cherrypick #37788 to 1.5 branch.
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@wojtek-t wojtek-t deleted the fix_kubelet_node_status branch December 20, 2016 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lavalamp lavalamp

@gmarek gmarek

@dchen1107 dchen1107

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-blocker release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@wojtek-t @k8s-oncall @gmarek @k8s-ci-robot @dchen1107 @lavalamp @k8s-github-robot @saad-ali @k8s-cherrypick-bot